#4 - Bad merge and fixing abstract inheritance issues