Engine Refactor and re-designing; Looking cleaner and cleaner