Removed old code
Added basic logging system