Cleaned up - still bugs to fix