Bug fixes - Working skeleton

Project now working