Major refactoring =)