Cleaned up

first working version