Initial checkin.. gunna remove the ~ files in a sec