Refactoring a bit, adding to current projects page