Added JDK8 stuff, hard-coded as of now. Also squashed a few bugs and added more tests. Still quite a few bugs left, however