[#40]Now working, needs code review

When you have the time, @ichinaski