Finish Basic Structure

Bug needs to be fixed