Under Construction

Working on some bug fixes