Final Commtment

Try to commit ALL the code now