Finished remerge

Integrated with our changes
Using the Classes from laganiere as much as possible