updated progress.. still have a lot to clean up. :D