#51 Hopefully not breaking everything. Adding new code