Re-organized everything, added todo lists