First commit with old code base.. need to rework this