Completely rewritten the project...