Second Commit

May be final, looks good so far