temporarily reverting some changes in order to make it usable until I can find time to work on it more