added some components
Made all changes
compilable
compilable
merging
cleanup
what?