get from github
Fixed everything that was broken. Back to where we were three days ago.
Layout portion is done
Layout portion is done (still)