Edit

Major Changes. Full working functionality