Preparing for today's meeting

Getting rid of old code, starting implementation of new code.