Ignore last commit, still not fully working, albiet working better