Merge developement branch

New architecture now working.