Beginning to consolidate code
Added Alex's files