Added a rough scoring system... finally.. Needs cleanup and some restructuring