Transitional Code

Redid the whole code tonight... will need to merge the two files
tomorrow so that everything works as expected.