Checking in updated state of the code. Starting analysis on functions now.