Finished converting Matt's stuff to something useable - logins not included