Completed source code.
Restarting project soon with junit testing.