done working on it for the night, will finish it tomorrow maybe