[#4] Now fully functional

[#4] Now fully functional