final commit

Everything working and ready for project commit