Removed constructors. These are being worked on.
Merge branch 'master' into modularize