Initial working style

Initial working style with a few minor bugs and issues.